[IA64] Remove GPFN_INV_MASK

This slightly simplify code and frees a pte bit.

Signed-off-by: Tristan Gingold <tgingold@free.fr>

diff --git a/xen/arch/ia64/vmx/sioemu.c b/xen/arch/ia64/vmx/sioemu.c
index 637599d562bb6d7e081828cf9877ce3b92354be8..7a533138afcce01d8c80acc72e790e35f1f06330 100644 (file)
--- a/xen/arch/ia64/vmx/sioemu.c
+++ b/xen/arch/ia64/vmx/sioemu.c
@@ -166,8 +166,7 @@ sioemu_add_io_physmap (struct domain *d, unsigned long start,
 
     /* Check area is currently unassigned.  */
     for (i = start; i < start + size; i += PAGE_SIZE) {
-        unsigned long mpa = ____lookup_domain_mpa(d, i);
-        if (mpa != GPFN_INV_MASK && mpa != INVALID_MFN)
+        if (____lookup_domain_mpa(d, i) != INVALID_MFN)
             return -EBUSY;
     }
 

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index b984ad44c77e1d860a2bcb24543d1e75a42476c9..4f880a7ca1582b9c8179629de4e827dd0db9d137 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -726,8 +726,6 @@ ____lookup_domain_mpa(struct domain *d, unsigned long mpaddr)
 
     if (pte_present(*pte))
         return (pte->pte & _PFN_MASK);
-    else if (VMX_DOMAIN(d->vcpu[0]))
-        return GPFN_INV_MASK;
     return INVALID_MFN;
 }
 
@@ -742,8 +740,8 @@ unsigned long lookup_domain_mpa(struct domain *d, unsigned long mpaddr,
             if (entry != NULL)
                 p2m_entry_set(entry, pte, tmp_pte);
             return pte_val(tmp_pte);
-        } else if (VMX_DOMAIN(d->vcpu[0]))
-            return GPFN_INV_MASK;
+        } else if (is_hvm_domain(d))
+            return INVALID_MFN;
     }
 
     if (mpaddr < d->arch.convmem_end && !d->is_dying) {
@@ -2797,7 +2795,7 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
         }
 
         /* This hypercall is used for VT-i domain only */
-        if (!VMX_DOMAIN(d->vcpu[0])) {
+        if (!is_hvm_domain(d)) {
             rcu_unlock_domain(d);
             return -ENOSYS;
         }

diff --git a/xen/include/asm-ia64/linux-xen/asm/pgtable.h b/xen/include/asm-ia64/linux-xen/asm/pgtable.h
index 70ac05f5c8feb8d6a8026e2be9d9dc156780a49b..c8f2dbebf95b54b0720f8c9cc64376a743f04813 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h
+++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h
@@ -108,7 +108,6 @@
 #define GPFN_HIGH_MMIO         (7UL << 60)     /* High MMIO range */
 
 #define GPFN_IO_MASK           (7UL << 60)     /* Guest pfn is I/O type */
-#define GPFN_INV_MASK          (1UL << 63)     /* Guest pfn is invalid */
 
 #else
 #define _PAGE_PROTNONE         (__IA64_UL(1) << 63)
@@ -342,8 +341,7 @@ set_pte_rel(volatile pte_t* ptep, pte_t pteval)
 #define pte_file(pte)          ((pte_val(pte) & _PAGE_FILE) != 0)
 #ifdef XEN
 #define pte_pgc_allocated(pte) ((pte_val(pte) & _PAGE_PGC_ALLOCATED) != 0)
-#define pte_mem(pte) \
-       (!(pte_val(pte) & (GPFN_IO_MASK | GPFN_INV_MASK)) && !pte_none(pte))
+#define pte_mem(pte)   (!(pte_val(pte) & GPFN_IO_MASK) && !pte_none(pte))
 #endif
 /*
  * Note: we convert AR_RWX to AR_RX and AR_RW to AR_R by clearing the 2nd bit in the

diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h
index 88934878db52d81dacb701e5a31535ad83704bd4..7bf01f17b974a5bd66aadb272fa48e9cf7cc242f 100644 (file)
--- a/xen/include/asm-ia64/mm.h
+++ b/xen/include/asm-ia64/mm.h
@@ -479,7 +479,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__,
     gmfn_to_mfn_foreign((_d), (gpfn))
 
 #define __gpfn_invalid(_d, gpfn)                       \
-       (lookup_domain_mpa((_d), ((gpfn)<<PAGE_SHIFT), NULL) & GPFN_INV_MASK)
+       (lookup_domain_mpa((_d), ((gpfn)<<PAGE_SHIFT), NULL) == INVALID_MFN)
 
 #define __gmfn_valid(_d, gpfn) !__gpfn_invalid(_d, gpfn)
 
@@ -488,8 +488,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__,
 ({                                          \
     u64 pte, ret=0;                                \
     pte = lookup_domain_mpa((_d), ((gpfn)<<PAGE_SHIFT), NULL); \
-    if(!(pte&GPFN_INV_MASK))        \
-        ret = pte & GPFN_IO_MASK;        \
+    ret = (pte != INVALID_MFN) ? pte & GPFN_IO_MASK : 0;        \
     ret;                \
 })
 
@@ -497,8 +496,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__,
 ({                                          \
     u64 pte, ret=0;                                \
     pte = lookup_domain_mpa((_d), ((gpfn)<<PAGE_SHIFT), NULL);            \
-    if((!(pte&GPFN_INV_MASK))&&((pte & GPFN_IO_MASK)==GPFN_MEM))   \
-        ret = 1;             \
+    ret = (pte != INVALID_MFN) && (pte & GPFN_IO_MASK) == GPFN_MEM;        \
     ret;                \
 })